Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature loading images #182

Merged
merged 3 commits into from
Mar 29, 2017
Merged

Feature loading images #182

merged 3 commits into from
Mar 29, 2017

Conversation

ringong95
Copy link
Collaborator

Closes #172

@ringong95 ringong95 requested a review from BlakeTurner March 28, 2017 22:37
@ringong95 ringong95 changed the base branch from master to develop March 28, 2017 22:38
=======
include ':react-native-image-to-base64'
project(':react-native-image-to-base64').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-to-base64/android')
>>>>>>> Linked Camera roll through xCode.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge conflicts here

class CameraRollView extends Component {
constructor(props) {
super(props);
const controls = props.controls;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this line here?

CameraRoll.getPhotos({ first: 100 }).done(
(data) => {
const assets = data.edges;
const images = assets.map(asset => asset.node.image);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest data.edges.map. You don't need the assets var.

});
const mapStateToProps = state => ({

});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is empty, delete it.

new MapsPackage()
=======
new ImageToBase64Package()
>>>>>>> Linked Camera roll through xCode.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicts

@BlakeTurner BlakeTurner merged commit f78bb0f into develop Mar 29, 2017
@BlakeTurner BlakeTurner deleted the feature-loadingImages branch March 29, 2017 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants